Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 06:11:31 +0000 (22:11 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 06:11:31 +0000 (22:11 -0800)
commitf62d76b606986d985a0ae593529586995e868de8
tree4997bf985382f75a298d7a6c71c2c37a03383b72
parentc64a8f5ddede36de71505f3b07de4395c7f8f932
parente588402aab5b321438665d49b54a6081a561f97f
Merge from mainline.